From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 3 Oct 2009 12:35:55 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10099
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b4233d9550d056e5ce7052bd128c547f0cf72c98;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index eed7f92b0e9..c2a04efbc19 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -134,7 +134,7 @@ First arg specifies the OPERATION, second arg is a list of arguments to
 pass to the OPERATION."
   (save-match-data
     (or (boundp 'ange-ftp-name-format)
-	(require 'ange-ftp))
+	(let (file-name-handler-alist) (require 'ange-ftp)))
     (let ((ange-ftp-name-format
 	   (list (nth 0 tramp-file-name-structure)
 		 (nth 3 tramp-file-name-structure)